Merge "Update language to comply with Android’s inclusive language guidance" am: f366f37aa1 am: 5383e257e2 am: 9df4a45b87

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

Change-Id: I5a210748f9e6e06789b8758fd0c3861e77a41bc7