[automerger] Fix the remaining holes for access to APN data am: 09a82c2251 am: 10a01c5555

Change-Id: I029791560d00d7ceeeaf95ab4b9c5900a2b84df2