Merge "Merge "Update language to comply with Android's inclusive language...

Merge "Merge "Update language to comply with Android's inclusive language guidance" am: feee9563 am: d5b8b0db am: 19847945 am: e17f5d1f" into rvc-qpr-dev-plus-aosp am: bff21e5c

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

Change-Id: I79b081cd59779a46af1b13df40ff41ebac1275ad