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

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

Change-Id: I1ee6c9f690c110ba4e8b563b194fa55391e4ba92