Merge "Include label in aquery error" into main am: ed0163ec am: 3e6167ef...

Merge "Include label in aquery error" into main am: ed0163ec am: 3e6167ef am: bd54226c am: fe482d98

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



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