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 am: 9c322124 am: 621138cc

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



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