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