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

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



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