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

[automerger skipped] Merge "Update language to comply with Android's inclusive language guidance" am: 0aa2a2f3 am: f11d0705 -s ours am: a1c2dbc9 -s ours

am skip reason: Change-Id I3c0d02e1ee94c575c3a18291d438b464d7396463 with SHA-1 e442f7f4 is in history

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1378757

Change-Id: I582b9ca4bb2655494f1a5001a1508b0ede64a807