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