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