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

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

Change-Id: I428d78f02bddd9668d16c00d941e42cb20614884