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

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

Change-Id: I0bb515ce675c94cc68b340e656044b8d3a2b0849