b75c584971
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1473228 Change-Id: I61cdda413fe21a46ac075a0abba2b9affa015149