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