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