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: 1b4b8990 am: f85f0e6b am: 8781f3f4 am: 8ae1d6e1

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



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