Merge "Update language to comply with Android's inclusive language guidance" am: 09b57ae95f am: 678e3dabaf

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

Change-Id: I8af3657bda2f47898d1578711f98677c448fd247