Merge "Update language to comply with Android's inclusive language guidance" am: 986e49df72 am: 21e5a00fb3 am: bc3cef1dce

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

Change-Id: I35743b9cc28f5f4b734a1f230f7ed4febba18ff8