Merge "Pass extras to playFromMediaId" into pi-car-dev
am: ee50181163

Change-Id: Ia3803312509881233c5d1bcfb9c2a7fc7a735bd4