[automerger skipped] Merge "Update language to comply with Android's inclusive...

[automerger skipped] Merge "Update language to comply with Android's inclusive language guidance" into main am: cba232a1 am: d87779d3 -s ours am: 331c2ad9 -s ours

am skip reason: skipped by user kimchan

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



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