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