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

am skip reason: Change-Id I14ed08390a7db0b4b962343c61d60230751047ce with SHA-1 21c02bbd is in history

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

Change-Id: I220b5f18b4774aed77bea6e20dd610552b9f2b7a