Merge "Update language to comply with Android's inclusive language guidance"...

Merge "Update language to comply with Android's inclusive language guidance" into main am: 3e78552e

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



Change-Id: I606094f4ecbc2bb9df7b9d5066e2c4de88fcdbd0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>