[automerger skipped] Merge "Merge ab/7061308 into stage." into...

[automerger skipped] Merge "Merge ab/7061308 into stage." into stage-aosp-master am: 1ba06032 -s ours am: 07fc110b -s ours

am skip reason: Change-Id Iee612ad0f443d5ae9fa9e469785f304394b3d40c with SHA-1 67c6b155 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I75ff8c00d356c3bdd09e878a6f23e588dd42107c