Merge "Update language to comply with Android's inclusive language guidance" am: e803bb122f am: 728932de46 am: f363e6306b am: bdffa07001

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

Change-Id: Iec417650eb13ad15ac93ab9cf3b770fabd6d7580