Merge changes from topic "aapt2_toggle_bazel" into main am: 37fb7334 am:...

Merge changes from topic "aapt2_toggle_bazel" into main am: 37fb7334 am: 5c53e28d am: dd719ded am: 83c4bc38 am: 7e97b1c5

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



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