Merge "Update language to comply with Android’s inclusive language guidance" am: 5f7d33da75 am: 5bcf151c30 am: 15c70f85ba am: 96c184e1cf

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

Change-Id: I5b7e47e200d0d41cb478b5203c84c89de981c1fb