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