[automerger skipped] Merge "Update/clear connection proxy of RIL upon single SIM and dual SIM switch" am: da67c9ba am: c056fc4c am: 7ec12368
am: baeac10d -s ours
am skip reason: change_id I8e09c97750d0849605b1c585df9702f40a20cb16 with SHA1 9f413ea7 is in history

Change-Id: Id237c368c6e38966294d49d445006950eb2936d7