[automerger skipped] Merge "Fixed concurrent access network registration info" am: 9e02ea4763 am: 3469404de1 -s ours
am: ecd2dceca4 -s ours
am skip reason: change_id Ic10931b7fab998bfebe09d316a2d87886222dae3 with SHA1 4c11809764 is in history

Change-Id: I71a4fd740bbe9795a1dbf1015f5ce13ae243f4ee