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 am: 301b40ec

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



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