Merge changes from topic "MediaSessionManager_isTrustedForMediaControl" into pi-dev

* changes:
  MediaBrowserService: Create getCurrentBrowserInfo()
  MediaSession: Create getCurentControllerInfo()
  MediaSessionManager: Add isTrustedForMediaControl()

diff --cc api/current.txt
Simple merge

diff --cc services/core/java/com/android/server/media/MediaSessionService.java
Simple merge