Merge "Fix apn restore issue for multi-sim"