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