Merge "Add the build flags for apex contribution contents" into main am: e9f270a6 am: 308388d2

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



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