Merge changes from topic "apex_contributions_build_flags" into main am:...

Merge changes from topic "apex_contributions_build_flags" into main am: c31b2497 am: e48000d8 am: 874d391f

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



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