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