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

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

Change-Id: I09c48ce04d58651ad3a71cb43f6202553ad783af