[automerger skipped] Merge "Refine APN fetching logic" am: 765621670b am: 74069bc022
am: ff5d0b0ac6  -s ours

Change-Id: Icc54600a67b20914df9d1112256f2f356ee289b1