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

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

Change-Id: I5b33ca0d4777cce8010573ba5ab182761b550192