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