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