[automerger skipped] Partial CP of ag/10846962 am: 5ea18c90 am: f45d6b6d...

[automerger skipped] Partial CP of ag/10846962 am: 5ea18c90 am: f45d6b6d am: 2dd36a1f am: cfe443f8 -s ours

am skip reason: Change-Id I1eb1dfb68190c68e896e87c5bea1f2ec44065e80 with SHA-1 99a2a725 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11758286

Change-Id: I6323de270521192ea98ecf4910d239b21f5a284d