Merge "Update language to comply with Android's inclusive language guidance" am: cc2d51fcef am: ed914ce683 am: 512c1c5ab9 am: e7d2991fb2 am: c08b68d049

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

Change-Id: Ife7a9e5dbd75d0bbe6d40ee257e50ea998df4822