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