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

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

Change-Id: Ic66bf514332fa57e0c11a2676131bda957dea99c