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