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

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

Change-Id: I99e9914ae5fc68aec6884a6f5c014ab458fc6464