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