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

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

Change-Id: Ifef7030a615b225ff28bc1de06b4ba69ccf982a1