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