[automerger skipped] Merge "Copy functionality into calling location from ApnSetting." am: cddf7e9ca3 am: 031d23f60e
am: 7c2759bd47 -s ours
am skip reason: change_id I27026f2c10c9f8e470057957477bfce44d8a0206 with SHA1 715880ae9f is in history

Change-Id: I4c7594edacd23258899d55917228b3462a1e95d4