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