Merge "Update language to comply with Android's inclusive language guidance" am: a5d1ef9837 am: 51ded68601 am: 9b0cd12ce4 am: cb6b00197d am: 2bc333e497

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

Change-Id: I8ca087405168151c31c04bc5fa0f74ccf3f007bb