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

Change-Id: I56a06d7604e7b5eaa0ac671ed322b2300331b240