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