Merge "Update language to comply with Android's inclusive language guidance" am: c0ef095e07

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1373401

Change-Id: I56583102774a223581bc6d060f78b95f2c7d5205