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