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