Merge "Differentiate MediaController in a process for MediaSession" into pi-dev am: 43688e8f2f
am: a31254bde1

Change-Id: I6b10eb78bf428cd93977d3075ae7a200b53bf92c