Merge "Refine APN fetching logic"
am: 765621670b

Change-Id: Ib0a1dd0b3f944d5a98b71555a48aadacfb228543