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