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