Merge "Update language to comply with Android's inclusive language guidance"...

Merge "Update language to comply with Android's inclusive language guidance" am: feee9563 am: d5b8b0db am: 19847945 am: e17f5d1f

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

Change-Id: I03e25f780fe92d4585e1737452bf12f60c425574