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