Merge "Merge "Update language to comply with Android's inclusive language guidance" into main am: d57068d7de am: 407947e270 am: 33a9e91f8c" into udc-d1-dev-plus-aosp