[automerger skipped] Merge "Skip ab/6749736 in stage." into stage-aosp-master...

[automerger skipped] Merge "Skip ab/6749736 in stage." into stage-aosp-master am: 101598c8 -s ours am: ae67133f -s ours

am skip reason: Change-Id I19ebbf405d4565c35a9201369facf6bb4c249335 with SHA-1 65b2c1e3 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/12804409

Change-Id: I9cc2ac98bb1e6ee4b79a7e3cd49d0d64a0a23970