Merge "Update language to comply with Android’s inclusive language guidance" am: aace0e5dad am: 762e462fea am: 4f2eb07963

Original change: https://android-review.googlesource.com/c/platform/development/+/1381456

Change-Id: If4962419bf150879b6b16d8279bafb1e7c07b0f9