Merge "Remove REMOTE_STREAM_MUSIC references from AudioService" into lmp-dev