Merge "Update language to comply with Android's inclusive language guidance" am: 4e6e7d7238 am: 19cb457e94 am: bde18f58a7

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

Change-Id: I7ccbfddb32aa56a7454904b46968daeb98343247