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: 8d4213d2 am: cdd61018 am: 5eacce44 am: a1c80d5c am: fd3314bf

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



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