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

Change-Id: Id70eb6d8fe60a8755b73bfe6be2f93c2c3de6bcb