[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: 770e3e84 -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: Ib18c6ae59e670a1eac608f7970ce7d3a507c37ed