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 am: 4b1a0c2a am: 06e8ba26 am: 004e3a61 am: 554e9ff5

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



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