[automerger skipped] [Carrier Wi-Fi] Reset config identity on reboot or SIM in/out
am: 3604d6f5ef  -s ours

Change-Id: I7bda5a9830fe553f7249f26f59104fab8443127e
tree: fd8d635d523095c065a0345a7d5560a001c34c6f
  1. service/
  2. PREUPLOAD.cfg