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: 8f549d82 am: 400c7811

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



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