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: eb1ddf02 am: 17c87a91 am: 684c1e66 am: c4aed212

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



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