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