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