[automerger skipped] Merge RP1A.200720.011 am: c8c8e8e8 -s ours am:...

[automerger skipped] Merge RP1A.200720.011 am: c8c8e8e8 -s ours am: ed22f488 -s ours am: 455e36ef -s ours am: 6f6c1415 -s ours

am skip reason: Change-Id Iec7a26ecd68aca9c7a38cc8f441197a8237b0c8c with SHA-1 b89c6d94 is in history

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

Change-Id: I75f79912ef24affe3a81dfd9dbcc550b5f40eb02