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