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: f32761d8 am: 5211c02d am: d7e8e59f am: 1dcf759e am: 36b31775

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



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