Merge changes from topic "stub_validation" into main am: bc98b415 am: 8a31dfb8 am: f62a6384

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



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