Merge "Update language to comply with Android’s inclusive language guidance" am: 698bcc6a30 am: 1cdaab7bda am: 3e82ffb72e am: 0b733d3cc9

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

Change-Id: I96ccf45bce9fbd51c7f3b7eaff97e8fa3ab84196