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