Merge "Merge "Update language to comply with Android's inclusive language guidance" am: feee9563e1 am: d5b8b0db79 am: 19847945d9 am: e17f5d1fad" into rvc-qpr-dev-plus-aosp