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

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



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