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

* commit 'fbf0068f960ac1a417eda6b556c8f12ebf94e0a4':

Change-Id: I35b71e06e6b20e18ec4e56cec7e9b09b92e7abf8