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: a2d740da

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



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