bf05d0ee6d
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1673385 Change-Id: I250937c71dfcf7868c6074eae28d3ecbf2892e79