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