Merge "Update MediaSessionService to comply with Android's inclusive language guidance" am: fc236dbda4

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

Change-Id: I26584e716869df745749ae50a859b9dca3af2f27