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