Merge "Update language to comply with Android's inclusive language guidance" am: 65703e6ae7 am: 8375b9299c

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

Change-Id: Ic494129c436b443fd011477dd45de752cec1e3b9