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