ec1f981309
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1655736 Change-Id: Ib8d66e1fb8845f3b47fd6e81091c0286ca6c8c9c