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

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

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