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