Merge "Use make_mock_top function" into main am: 36674db0 am: 83ea7f60 am:...

Merge "Use make_mock_top function" into main am: 36674db0 am: 83ea7f60 am: 86dbd2ff am: b86ccc4a

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



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