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

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

Change-Id: Ib5c7fb0f4b1944ae6507fa080e0b042f439d0d18