Merge "Update language to comply with Android's inclusive language guidance" am: e66098036f am: d85403cc70 am: d3a216ae4f

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

Change-Id: Ib53b46257c7fec87c0da23832776133107f13e5d