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