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: f2ac9e60

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



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