Merge "Differentiate MediaBrowsers in a process for MediaBrowserService" into pi-dev am: 0e7a307e14
am: 0349869c06

Change-Id: I1ae64f0ac0192afd4e6fc777a1ed4b2b7dd579a3