Merge "MediaSessionCompat: Make playFromUri() work on API 21-22" into mnc-ub-dev