Merge "MediaSessionService: Leave log for media key events" into nyc-mr1-dev