Merge changes from topic "Read dun APNs from apn db" am: f9390ce1fb am: b87acf6837
am: a81a339c1d  -s ours

Change-Id: Ic593111485af94e822cf2644d7e5bf5348287f1a