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