Merge "Clear calling identity when performing phone factory reset." into mnc-dev