am dded214e: Merge change 6689 into donut
am dded214e: Merge change 6689 into donut

Merge commit 'dded214eb92cebdd7fb2e6405173ffc1932e795a'

* commit 'dded214eb92cebdd7fb2e6405173ffc1932e795a':
  Don't crash the app when restore agent bringup throws

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