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

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

Change-Id: Ic012e70d74fec68c05a51ad9f22fe09ecb11af3f