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