[automerger skipped] Merge "[Settings] Avoid crash when adding new APN" am: 18bf77eef9
am: 3fd54b4e67
-s ours am: 9777ca7dd9
-s ours
am skip reason: Change-Id I70362a2aea15c5eb52d10af21025cf9643097803 with SHA-1 cd1fd106c9
is in history
Change-Id: I2c3f8a933b9bb47ae027cdeb67045a8a4a769ee3
This commit is contained in: