832ce8f925
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1686657 Change-Id: I08b1d281a3b71556d783b1d4f352bc7a4ba8e879