Merge "Update language to comply with Android’s inclusive language guidance" into rvc-dev-plus-aosp am: ee4e5355bf

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

Change-Id: If4fa13f2b471943f9cf9624ff9089ef6b6bdb628