[automerger skipped] Merge "Make sure TelephonyBackupAgent backs up hidden subscription." am: 74cee67408 am: c1b642dacc
am: 371aaf4426 -s ours
am skip reason: change_id I3aff34101b6d2f45cdd074c6b1b908930897b0cb with SHA1 40c5d14a3a is in history

Change-Id: I8f692091f34e07fa82e886f11634845878610dd9