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

Change-Id: I63a5ab7c47affd4043889c19b8f49da2d4442cb7