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: 0698cb8b

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



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