Merge "Required deps don't track native bridge architectures" into main am:...

Merge "Required deps don't track native bridge architectures" into main am: a03e16f1 am: 1d6f3391

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



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