3453ec5024
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1635221 Change-Id: Id012600c0f06b25c90598543a20673e6f515bf29