Merge "Update language to comply with Android’s inclusive language guidance." am: 569a4f746e am: 7e2c5975c5

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I25ef621f757b9a838efc118bf4034ce429c5a6b2