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