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: 6318d8ca am: 9af72609 am: b83d4c43 am: b3026d8b am: ea6e62c3

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



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