Merge changes I9b6da97e,I1ab89d12

* changes:
  Remove using hidden API: MediaSessionManager(Context)
  Remove using ServiceManager API in MediaSessionManager