Merge "[automerger skipped] Merge "Update language to comply with Android's inclusive language guidance" am: 56f5e659 am: e7b108a3 -s ours" into rvc-dev-plus-aosp