Merge "Update language to comply with Android's inclusive language guidance" am: c0ef095e07 am: 55322db6c0 am: 58731af1cd

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

Change-Id: I11bd697e40d7c845b24097e21cc74f25907ed1e5