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