Merge "Update language to comply with Android's inclusive language guidance" into main am: 5db4dc6c58 am: fb3de26341 am: 3a0bf2d46a

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

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