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

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

Change-Id: I253ac91cb08453fd5480645267160fffdf714bf7