am 9756a70b: Merge change 23582 into eclair

Merge commit '9756a70bd92fb844d2fd8346cc4bb6c8bb768c4b' into eclair-plus-aosp

* commit '9756a70bd92fb844d2fd8346cc4bb6c8bb768c4b':
  Expand apps' control over the settings restore process