[automerger skipped] Merge ab/6749736 in stage. am: fb486680d5 -s ours

am skip reason: Change-Id Ib2b2aad76699226b54a0ea9b98dacdea1527363d with SHA-1 0c0e7dcfcb is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/development/+/12804428

Change-Id: Ib05b6d23d7c85d0b0c9bd5443ae7340694d20342