Merge "MediaBrowserCompat: Make Patination API work on API 21-23" into nyc-dev
am: ba5640841e

* commit 'ba5640841ee4205cfe4c917617ead92998a00103':
  MediaBrowserCompat: Make Patination API work on API 21-23

Change-Id: Iee07a89936a0c808236a9b6b85d538ad29c336d5