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