Merge "Fix apn can't be updated when pressing back key" am: 5c6e7a2116 am: 2d38abb49a am: 2366d4dcfd
am: b4624dceda

Change-Id: I72288936aaf38faf2810dbcf2e426aca68aa8242