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