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

Change-Id: Ie09e4e42e965d9d5e7de4de5e21bd2b2390b9b74