Merge "MediaSession2: Protect MediaSessionManager APIs with permission" into pi-dev am: 9e5a7f2a63
am: 07d23014b3

Change-Id: Ia0fdc6d9808b8270c7e344d187a427ab959e3ecc