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