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

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

Change-Id: Ib0114b9c32c7b062586472570e1cb565eed452ae