Merge "Update language to comply with Android's inclusive language guidance" am: e2d9b14b60 am: 6f22d2c310 am: 9bade16516 am: acbb11f541

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

Change-Id: Id7d021735658dcaac146aa1bca4cf46698da1bd1