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

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



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