b079e02a39
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1311659 Change-Id: I4605077e115f200f1808403307131ff8c2a82d01