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