ef4b30c59d
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1653937 Change-Id: I2a51fc361a3ef6fe7a99fe70e8c47fdffa2903bd