Merge "Duplicate buildPhoneAccountConfigureIntent" am: 6987f00429
am: 950d50b80f

Change-Id: I60c6cf8d4af9eae0b4c8ce8248dc8e2e8b455692