am 9568fb21: Merge change 26164 into eclair

Merge commit '9568fb21766684083ec256303a6ed7949ada7d9f' into eclair-plus-aosp

* commit '9568fb21766684083ec256303a6ed7949ada7d9f':
  Reset backup tracking in response to transport data-wipe notification