Merge "AOSP/Gallery2 - Update language to comply with Android's inclusive language guidance." am: 9733e9fd18 am: 965f71fe03 am: 79b675a9fc am: 4d57a95242 am: 38c734b299

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

Change-Id: Iea95775ab87680af814aa64ef390a09ea9208a21