[automerger skipped] Merge "Merge mainline-release 6664920 to...

[automerger skipped] Merge "Merge mainline-release 6664920 to stage-aosp-master - DO NOT MERGE" into stage-aosp-master am: 2d906205 -s ours

am skip reason: Change-Id I91b91ce6a1d3924bf575ed8c0da8e51116462e00 with SHA-1 76efa7d1 is in history

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

Change-Id: I08e2c40d495ea1c6e1f8a1e9120d028a4a36b9f0