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 am: fc3617d1

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



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