Merge "Update language to comply with Android's inclusive language guidance" am: bad5c4ec49 am: 99ed998f0e am: 31af0da082

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

Change-Id: I8f14f27529dc42e4bf8515ce317024f468622b54