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

Change-Id: I8ad58f5f59ab552180415990b1f4ba6f53681443