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