[automerger skipped] Merge "modprobe: Use more inclusive language for libmodprobe (Part Deux)" into rvc-dev am: a8c92eaa -s ours

am skip reason: Change-Id I14ed08390a7db0b4b962343c61d60230751047ce with SHA-1 9debda17 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/11930457

Change-Id: Iffba63597a2928310c97ee832895fac26d21af67