[automerger skipped] Merge "[DO NOT MERGE] Capture the build command that...

[automerger skipped] Merge "[DO NOT MERGE] Capture the build command that executed the build system." into rvc-dev am: b157ffc6 -s ours am: 6b49ce61 -s ours

am skip reason: Change-Id I7ab94dcf037211f1abffe6afd012b03ffbf99756 with SHA-1 807a8f91 is in history

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

Change-Id: I6a2b6740a8181b8ed8687ae86def6f4ad30529cc