Merge "Update language to comply with Android’s inclusive language guidance" am: dce2f1c04b am: c686b1f21c am: 50015ad612 am: 7ee1dc7321

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

Change-Id: Ib309e244728db2b4182040d55286aab74ee446e7