[automerger skipped] Merge changes from topic "b204127880_pipeline_backport_1" into sc-v2-dev am: 8693114f am: 260bae03 -s ours

am skip reason: Merged-In I05931f89596b4145f2c5d31cb32b2d451fc280b6 with SHA-1 fc40850f is already in history

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

Change-Id: Ibca68182c93a2f9936bbe1e0fb0e0762f0fb61df