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: d259fb38 am: 23228107 am: b22aa3f7

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



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