Merge "Update language to comply with Android's inclusive language guidance" am: 18e37909f3 am: 2009a6f05e am: fee9000990 am: 180266434e am: c38049f901

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1374877

Change-Id: Iae2368dff7f55c6e380e35fc2471cef06a9a4538