Merge "Update language to comply with Android's inclusive language guidance" am: 0090d82f18 am: c3972b8d97 am: 460fc577c9

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

Change-Id: Ia18cae33d2efc71f61c1a2a37b25a1fb2147ccfb