[automerger skipped] Merge "Expose ApnService as a SystemApi and use subId arg" am: 0e706db965 am: 6a0161a184
am: 5333436303  -s ours

Change-Id: I92644cb76dbf1f01e553e46c5b85f3c3d8c4ddc7