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

Change-Id: I40742422901506152b4c61a716f3b8809a9b23d3