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