Merge "Update language to comply with Android's inclusive language guidance" am: 7ee1f8e6a9 am: 47eeb27cb1 am: 65707f3c0b am: 0a664e383b am: 2dfbf5c87c

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

Change-Id: I2cd44e50eb497ae0d3b53a7945af3c9be67beefa