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

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

Change-Id: I7d3b0cf32a89ab4ff16a77d6b075fb9011297288