Merge "[automerger skipped] Merge "llkd: Use more inclusive language" into rvc-dev am: da0a2ae7 am: b1b29c9f am: 9f157b1f -s ours" into rvc-qpr-dev-plus-aosp am: dc34e64e -s ours

am skip reason: Change-Id I6db7ad321684759e3c5ac1f66f940b6e8a5709a0 with SHA-1 4ca9fa9e is in history

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

Change-Id: Icaf239b2cc7822f1545d881eda06cca15e3e21c9