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: f2ac9e60 am: 70f91da3 am: 914616c6 am: f8355e7d

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



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