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

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



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