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

Change-Id: I8deb492fa82dcb2bec04d85a65a0aa267be830a4