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