550f4dd9a0
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1818366 Change-Id: I54c94567fa6677f1cfe2ca818c889275d8cb6f1c