b90c974174
4d2944cda4
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1290954 Change-Id: I13fb2f296c8c026619e817e5fd8a16098d1dcc6c