Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15580595 Change-Id: I4bf514a6a0a9bbf62b9fd423c1d147f494f4d950