Merge "Fix reanalysis after full build" into main am: 05d90690 am: 49361b61

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



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