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