Merge "Fixed tests for TelephonyBackupAgent" into nyc-dev
am: 0ccec3a83d

* commit '0ccec3a83dfa5e06431af58e6b30d03eadd2ab83':
  Fixed tests for TelephonyBackupAgent