Merge "Remove module with a cc_test_library static dep" am: e7773041 am: 5cc26c74

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



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