Merge "Update language to comply with Android's inclusive language guidance" am: 1bab8b0107 am: 8d99f4d8e5 am: d7a6afd5b7 am: 7c00f5fed1

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

Change-Id: I0b51150a76112fefd996de7034fbd65b35ddc330