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

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

Change-Id: Ibce7f203cd507d346f0d16d487117c2e6a867920