Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12040945 Change-Id: I8eec902878e34cb6a4ee7989d45cc0c7149c791c