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