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: 8d4213d2 am: cdd61018

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



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