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