[automerger skipped] Merge "Duplicate buildPhoneAccountConfigureIntent" am: 6987f00429 am: 950d50b80f
am: 616a948d39  -s ours

Change-Id: I677da50a7527254e6d6f529dac9753de16035890