bdf15f2234
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1810680 Change-Id: I2614171ee4fc1822a2a3c1e7e50658487218a34d