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

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



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