8b190a9d68
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1650991 Change-Id: I1e6c2d71e3ab7f9331df45d233e23619a50e5f38