Merge "Fix apn restore issue for multi-sim" am: 6a39c8ba87
am: dd5e0d735e

Change-Id: Iae16bbfc697d683ea76378c864c8914f68fcbc28