Merge "Revert "Append APEX version instead of build ID for APK-in-APEX ...""...

Merge "Revert "Append APEX version instead of build ID for APK-in-APEX ..."" into tm-dev am: c17b7005 am: 81af5e86

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



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