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