Merge "Copy functionality into calling location from ApnSetting." am: cddf7e9ca3
am: 031d23f60e

Change-Id: I77e08c350e575f40543b335a4ed6688d61ab083c