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

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

Change-Id: I7db7e40fdba8b40f336b83fbb25486480d8f2ac9