Merge "MediaSession2: Match APIs with MediaPlayerBase" into pi-dev

diff --cc media/java/android/media/MediaSession2.java
Simple merge

diff --cc media/java/android/media/update/MediaSession2Provider.java
index 0faed9d,5d26894..ed96b6d
--- 1/media/java/android/media/update/MediaSession2Provider.java
--- 2/media/java/android/media/update/MediaSession2Provider.java
+++ b/media/java/android/media/update/MediaSession2Provider.java
@@@ -66,10 -66,8 +66,10 @@@ public interface MediaSession2Provider 
      MediaItem2 getCurrentPlaylistItem_impl();
      void notifyError_impl(int errorCode, Bundle extras);
      int getPlayerState_impl();
-     long getPosition_impl();
+     long getCurrentPosition_impl();
      long getBufferedPosition_impl();
 +    void setOnDataSourceMissingHelper_impl(OnDataSourceMissingHelper helper);
 +    void clearOnDataSourceMissingHelper_impl();
  
      interface CommandProvider {
          int getCommandCode_impl();