[automerger skipped] Merge "Suffix the build ID to the dirname of APK-in-APEX...

[automerger skipped] Merge "Suffix the build ID to the dirname of APK-in-APEX files." am: 3a5be76d am: 423fb975 am: 22090e09 -s ours

am skip reason: Merged-In I8af49d51ff99cf8184d0e4d1136fff1cdb29c23e with SHA-1 11cca671 is already in history

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



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