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

* commit '1e63893ad2f0009678d9d088f79bc8014fa75c1d':

Change-Id: I61762a43d93945cf44ac5d985599b9f10e8a9857