[automerger skipped] Append APEX version instead of build ID for APK-in-APEX...

[automerger skipped] Append APEX version instead of build ID for APK-in-APEX paths. am: 3b1dcf4f -s ours

am skip reason: Merged-In I9cef1418c3fc7e0970d96995b8398f5e82f479e0 with SHA-1 6cb124b8 is already in history

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



Change-Id: Ibe6af57ae8071c512f85ecadfc263cab684b3084
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>