Merge "MediaSession2: Fix random NPE in MediaBrowser2Test" into pi-dev
am: aa79f03ca6

Change-Id: Id0752a1ddada27d43ff8da59b2ae0b96dd92d29c