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

Change-Id: I24da31ad888b911a5d627de6057fa87f0858ba79