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

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

Change-Id: Ibea8b326aba347acfd948310378580940c3f0cd7