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: f2ac9e60 am: 70f91da3

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



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