am 28c5b96d: Merge "Address multiple RemoteControlDisplay competing for registration"
am 28c5b96d: Merge "Address multiple RemoteControlDisplay competing for registration"

* commit '28c5b96d840c24947fd29f2e65646ff37f5dc7ff':
  Address multiple RemoteControlDisplay competing for registration

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