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