Merge "Update language to comply with Android's inclusive language guidance" am: 98973ea706 am: 9d67d59530

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

Change-Id: Ifb4996d7ccbb7e47da1bb1b8246fb5da94626d4c