Merge "Update language to comply with Android's inclusive language guidance"...

Merge "Update language to comply with Android's inclusive language guidance" into rvc-dev-plus-aosp am: 63ed9937 am: ab9c465a am: a4ccb877

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

Change-Id: I5fe7ce511440e38a4e942eb5172bc7d3c27d7fc9