Merge "Update language to comply with Android's inclusive language guidance" am: 558a921d81 am: 927f0f7453

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

Change-Id: I03a1373dcc1cdcf0d73536d98d5205317183cdef