Merge "Duplicate buildPhoneAccountConfigureIntent"
am: 6987f00429

Change-Id: I77417efe738e771a9134e222c9e2bc563b2f3b30