95c68c6024
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1889876 Change-Id: Ice36d05d07c69fbd84e6a9a5f3f173769b0551c7