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

Change-Id: Ic25cbaf21b7f0328ca16cd45f0d74c1c38ae9c5a