Merge "Update language to comply with Android's inclusive language guidance" am: ec88a69b00 am: 2fe4f69ea3 am: 3bb5a01e9c am: 6ea2f0fd7d

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

Change-Id: I280850c23b4ff013718a611406cdec158170a3ff