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