am e2047da6: am d9bf2652: Merge "Revert "Clean-up state if we have an exception when acquiring provider""
am e2047da6: am d9bf2652: Merge "Revert "Clean-up state if we have an exception when acquiring provider""

* commit 'e2047da6f3f21fc702d35b7d1c4e9bb62c963dac':
  Revert "Clean-up state if we have an exception when acquiring provider"

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