Merge "Update language to comply with Android's inclusive language guidance" am: 31be55091f am: df5b66050c

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

Change-Id: I9bff1926c2878da6b20f67482683afccb21123f4