Merge "Update language to comply with Android's inclusive language guidance" am: 4b69c3c115 am: 9b956d4954 am: c46340e92c

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

Change-Id: I41dec2d71360d6e464f82d92f1f637f449738d16