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