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: 02b16819 am: 4b1a0c2a

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



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