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 am: 70f91da3 am: 914616c6

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



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