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

Original change: https://android-review.googlesource.com/c/platform/packages/providers/MediaProvider/+/1382386

Change-Id: I3aeca9511fde2f3335f66d3b3a6ce9fc4c4d52ff