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