[automerger skipped] Merge "modprobe: Use more inclusive language for...

[automerger skipped] Merge "modprobe: Use more inclusive language for libmodprobe (Part Deux)" into rvc-dev am: a8c92eaa -s ours am: 4cef46a0 -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: I30234b79471ff7c26f041505add3ce97904872e7