Merge "Clear caller identify before registering and unregistering phone acct." am: 91d5655e89 am: 35cfbaef3c
am: c77d3e4447

Change-Id: I7f99da7659a8d4abb0974a3b34b9ac7b22e0beee