f1a1d71020
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1469125 Change-Id: Ibdf919a762952350dc89bda59724b2f0cb291313