Merge "When restoring APNs, getApns takes a subId arg"
am: fc10d0a4e4

Change-Id: Ic92361122576ece20426861014db53f79bae0338