Merge "Fix apn can't be updated when pressing back key"
am: 5c6e7a2116

Change-Id: I5f7cf29476e88c3603c902c5e501bef08fad5c8c