am 85a0a057: Merge "Bug 5045498 Implementation of RemoteControlClient.MetadataEditor"
am 85a0a057: Merge "Bug 5045498 Implementation of RemoteControlClient.MetadataEditor"

* commit '85a0a0576629e7675d87b95c089368dc4acd090e':
  Bug 5045498 Implementation of RemoteControlClient.MetadataEditor

xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base