Merge "Update language to comply with Android's inclusive language guidance" into rvc-qpr-dev am: 792e2be0fd

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

Change-Id: I31fc971801d9c30bbc61e8fbd97b5aed4d5a775a