Merge "MediaSessionCompat: Make getCallingPackage() work on API24+" into nyc-dev