When restoring APNs, getApns takes a subId arg

Bug: 113075153
Test: manual and unit tests
Change-Id: I8abf822f4096055d00601dd642faf59eecb7bf31
Merged-In: Id7df64c8623b59910d8e5ace9207b8212fe68a99
1 file changed