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

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



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