ace9a3d468
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1577123 Change-Id: I218559824dc81cc1b57f17ef43f3fb29ec0fc4f5