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 am: 3f4f25a7

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



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