Merge "Update language to comply with Android's inclusive language guidance" am: 5db2bcffdf

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

Change-Id: I6ce21c63b8c635b37c8a5cb91315dfc092d9d27c