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: fabdb43a am: 2e3274f3 am: 22f48a2b am: 513c622e am: 1c681a37

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



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