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