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

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

Change-Id: I67f754501e5e9947bfd2891a156d46908dd8ab23