[automerger skipped] Merge changes from topic "b204127880_pipeline_backport_3"...

[automerger skipped] Merge changes from topic "b204127880_pipeline_backport_3" into sc-v2-dev am: a509832d am: ab51b43b -s ours

am skip reason: Merged-In I342a09ef71a223b24db075e5f2ef68a6950ff32b with SHA-1 f20d265c is already in history

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

Change-Id: Iec05674e247428d2df757f3065a911ce41c0b7aa