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: 8f549d82 am: 400c7811 am: eef0f46b

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



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