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

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

Change-Id: I23744e158143a09d887e0ff1de912f687ffd0ded