Merge "Update language to comply with Android's inclusive language guidance" into main am: 4af0170659 am: 1b58f156cd

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2720055

Change-Id: I0acce57f32bcb12c0dd5375846683d8c958b6016
Signed-off-by: Automerger Merge Worker <[email protected]>