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

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

Change-Id: I184bb0f92a93f1741a7f8e0bff441415bacbb44c