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