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: 0698cb8b am: fc3617d1 am: f5078ee6

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



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