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: 58a0f136 am: 2b6a1ae7

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



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