Merge "Comply with inclusive language guidance in media session and browser" am: 93a807bcf7 am: 75fa27a100

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

Change-Id: I2b9b4eef4cf075e9b38de2f5db4e73db3406e16a