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

Change-Id: I7bda5a9830fe553f7249f26f59104fab8443127e