Merge "Remove combined_apis_defaults module type" into main am: fd3466c405 am: 79298b6f35

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3184524

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