Merge "Revert "Qualify prebuilt_etc apex module name by relative paths"" into...

Merge "Revert "Qualify prebuilt_etc apex module name by relative paths"" into main am: 3ef813bd am: 0ed7bfec

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



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