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