[automerger skipped] Merge ab/6749736 in stage. am: fb486680d5 -s ours am: de2870e92c -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: I1cbfe8a34b0a69d7bbc7241d7d05e76a93534e1d