Merge "Update language to comply with Android’s inclusive language guidance." am: 5eb8de6ed7 am: d8d2a05841 am: ed31406794

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id8a8b2fda3d13f9cb80a9c282b8494ae7a29b629