Merge "Make MediaSessionService not blocked by AudioService." into mnc-dev