[automerger skipped] Merge "When restoring APNs, getApns takes a subId arg" am: fc10d0a4e4 am: d859b7b490
am: 89c97b764a  -s ours

Change-Id: Ie79e67c89f2a3a0e4765e1ad013a3d5c422daa28