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: 5db4dc6c

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



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