Merge "Make sure TelephonyBackupAgent backs up hidden subscription."
am: 74cee67408

Change-Id: I3c6c79d93e52208d90e7538217c9009708eca8a0