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