Merge "MTP: Update language to comply with Android's inclusive language guidance" am: 86b6f66d9f

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1382396

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibf8efbd06b6839f8922cc2415e1d13ddc0769b25