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