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

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

Change-Id: I3574bef24df1c17124348ce26d479fcb7079d101