Merge "Expose phone account register/unregister intents." am: 24299f5b06
am: b993a44272

Change-Id: Ic3f8044b7df278b33208fae671abef21ae8f55d2