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 am: b07d0ef9

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



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