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 am: ce0c2b9b

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



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