Merge "Update language to comply with Android's inclusive language guidance"...

Merge "Update language to comply with Android's inclusive language guidance" into main am: 5908abd4 am: 168ac701 am: 5eed0177 am: f8abcc79 am: 7f8a00c6

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



Change-Id: I70ec9d2e9e90f363a3da26defbdd60490ef05ba7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>