[automerger skipped] DO NOT MERGE Fix the remaining holes for access to APN data am: 06c21538c2 -s ours
am: 728e3d352c -s ours
am skip reason: change_id I59b297642d2000dde0a83f77b20112c7382b7ef1 with SHA1 09a82c2251 is in history

Change-Id: I46c9d70822af289b169f563225d9ea7620fc41cc