Merge changes I528ff70c,Ifdae76ae,I53abdb1a into nyc-dev

* changes:
  MediaSessionCompat: Make prepare* methods work on API 21-23 devices
  MediaSessionCompat: Make prepare* methods work on pre-L devices
  MediaSessionCompat: Make prepare* methods work in the support library