Merge "Update language to comply with Android's inclusive language guidance" am: 4cd108aef6 am: d951dc8e29 am: d0435400ab am: b799234bc6

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

Change-Id: Ib23a985c3941ae99ac245f9c29926bae3e9e5ba4