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: 43604e98 am: c33705cd

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



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