Merge "AOSP/Contacts - Update language to comply with Android's inclusive language guidance."