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

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

Change-Id: Iecf8601b2f9e286cefca0675476d0892436d5e5b