am d05eb9e6: Merge "Update to using CONFIGURE_PHONE_ACCOUNT" into mnc-dev

* commit 'd05eb9e6039278bb514854d7b5fbc99574a50d97':
  Update to using CONFIGURE_PHONE_ACCOUNT