Merge "Merge "Update language to comply with Android's inclusive language guidance" am: feee9563 am: d5b8b0db am: 19847945 am: e17f5d1f" into rvc-qpr-dev-plus-aosp