am b4e7d4ca: Merge "Allow listeners to be set before the service connects."
am b4e7d4ca: Merge "Allow listeners to be set before the service connects."

* commit 'b4e7d4ca7502bb8ff599229ec90c1bf5b481f2f7':
  Allow listeners to be set before the service connects.

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