54a4e7a360
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1809160 Change-Id: Ie6e19ce58bb823ae259e80d1bb24347d9330c134