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