Merge "Remove make information from compliant db in soong-only build" into...

Merge "Remove make information from compliant db in soong-only build" into main am: 5f09297f am: 6ee764fa

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



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