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: 02b16819

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



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