Merge "Update language to comply with Android's inclusive language guidance" am: b6488ac518 am: 1f27abf523 am: f2f4e95bac

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

Change-Id: Ia35293005942c7c29b4e18e325889f3eb4319fcb