Merge "Update language to comply with Android's inclusive language guidance" into rvc-d1-dev-plus-aosp am: 8dc88a6a46

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

Change-Id: I64a93918ba6206c48a2416e53c0320dae41f8ce2