Append APEX version instead of build ID for APK-in-APEX paths. am: 3b1dcf4f

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



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