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

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

Change-Id: I81e86c859d266d1831c09b1535cdc296be5eead2