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: f82f607d am: 2767dd9d

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



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