Merge "De-duplicate kernel module names" into main am: a997e480 am: 3a5de124

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



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