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