Merge "Make buildroot.cquery determinisitc" am: 7a9626c6 am: 29fb9ead am: 177d8ca6

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



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