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