Merge "Expose phone account register/unregister intents." am: 24299f5b06 am: b993a44272 am: d046aa9103
am: 03dbae246e  -s ours

Change-Id: I0b7e021287a51b71d8ac996a659fc3383445ddb3