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: fabdb43a am: 2e3274f3

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



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