Merge "Remove duplicate in unbundled build moduels defined in...

Merge "Remove duplicate in unbundled build moduels defined in TARGET_BUILD_APPS." into main am: 8c656ae6 am: 7ec1b82e am: 067f3376

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



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