2a1b0ab7cd
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1772025 Change-Id: I3d678a8d3315f884bacfd3052218416604bf3e2c