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

Change-Id: Icfda508bc792f9af8f9df35c17f13db6bb3c7f7f