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

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



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