Merge "Differentiate MediaController in a process for MediaSession" into pi-dev
am: 4d4f79588c

Change-Id: Ie7690bfe70b888480c90be6b4419db5b154b27ba