Merge "MediaSession2: Fix random NPE in MediaBrowser2Test" into pi-dev am: 44da223a0d
am: 200aad99e8

Change-Id: I99184f56d820e15bdd4bb3e9721d0a28ce69e667