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