[automerger skipped] Merge "llkd: Use more inclusive language" into rvc-dev...

[automerger skipped] Merge "llkd: Use more inclusive language" into rvc-dev am: da0a2ae7 -s ours am: 5d034d59 -s ours

am skip reason: Change-Id I6db7ad321684759e3c5ac1f66f940b6e8a5709a0 with SHA-1 6d9e5159 is in history

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

Change-Id: I709bf488674a9835a84fd6969cd6d136620917a8