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

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Camera2/+/1373758

Change-Id: I01139ac62fa207c13193113d19d0b075b3543949