b68825591b
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1556100 Change-Id: I229c3033a16d6b7f11f1b3f02351cc0d2153d199