[automerger skipped] Merge changes I6c486303,I073934f3,I6ee66149,Ibbb4325c...

[automerger skipped] Merge changes I6c486303,I073934f3,I6ee66149,Ibbb4325c into mainline-prod am: d05921c6 -s ours am: 94592d36 -s ours am: 4710f45a -s ours am: f20b7a37 -s ours

am skip reason: Merged-In I6c4863030c36328db571294fd12a40e59864def5 with SHA-1 a3e06358 is already in history

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

Change-Id: I79606cbbce232996e425a1c2f7221396797c72f6