Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1365959 Change-Id: I5249836f51e7332b0e5db17f7695733e921b2652