Merge "Update to using CONFIGURE_PHONE_ACCOUNT" into mnc-dev