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

* commit '2b4e7d7d94695c620562094e9920b18868ef3468':
  Update to using CONFIGURE_PHONE_ACCOUNT