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