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

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

Change-Id: Iecfb16058b7ae386c99e7365593b8fd26c6b5390