Merge "Qualify prebuilt_etc apex module name by relative paths" into main am:...

Merge "Qualify prebuilt_etc apex module name by relative paths" into main am: 277e444c am: aae86c89

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



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