Merge "Update language to comply with Android's inclusive language guidance" am: f98e615b6d am: 9016cc88e3

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

Change-Id: Ifca888e568832dc25e46bccd72f135017b9638f4