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

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

Change-Id: Ia26b0c80df080afb36dd723740abca78aeb6ce25