Merge changes from topic "stub_validation" into main am: bc98b415

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



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