Merge "Update language to comply with Android's inclusive language guidance Test: m checkbuild"