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

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

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



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