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