Merge "De-duplicate kernel module names" into main am: a997e480 am: da7e14b9 am: cf0c76fa

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



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