[automerger skipped] Merge "Use Stem where output file name is expected in...

[automerger skipped] Merge "Use Stem where output file name is expected in APEX" into rvc-dev am: 4ecb0d6b -s ours

am skip reason: Change-Id I4a4892bc2941cf1301d210fc3107c02f0e7b13b7 with SHA-1 f1493cc0 is in history

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

Change-Id: Iee7cfcf0059dc63a936baf9ef81f1fb5f624a85a