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