Merge "Add combined_api_defaults module type" into main am: 364446fa7a am: ceaff1ca1a

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

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