Merge "Update language to comply with Android's inclusive language guidance" am: b590b3f07f am: a6f5cae4ce am: 5403d40570 am: 37708888fb

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

Change-Id: I1bc84cceae8eebec2e41485446c75feaa89ec46d