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