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