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

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

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



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