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