Update to using CONFIGURE_PHONE_ACCOUNT

Continue supporting old format for existing app.

Bug: 21573551
Change-Id: If98f96a41f148f5dabd5f0549e3cdb2ef776c0fc
3 files changed