Merge "Update language to comply with Android's inclusive language guidance" am: 4cd108aef6 am: d951dc8e29 am: d0435400ab

Original change: https://android-review.googlesource.com/c/platform/developers/samples/android/+/1402487

Change-Id: Ic692a35b5819777dbdca8b9f6cc019b603ac43e8