Merge "Fix prebuilts of overridden apps" into tm-dev am: d7d2a2a6

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



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