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: 892ede1c am: 3640b11d

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



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