Merge "Update language to comply with Android's inclusive language guidance" am: f8ca47966f am: 26d3e569db

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

Change-Id: I090f2b972cd5d0221da4d690d98df29f4a5b0445