Merge "Update language to comply with Android's inclusive language guidance" am: f8476d358f am: 779a1aedd5 am: 9f1608f214

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

Change-Id: If391531e878e43b8856b230d3b5a12fb0e5492e1