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