am 8f0e0c1f: Merge "Clean-up state if we have an exception when acquiring provider"
am 8f0e0c1f: Merge "Clean-up state if we have an exception when acquiring provider"

* commit '8f0e0c1f3d7c02dff6fe4877477af583e490e6ee':
  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