[automerger skipped] Merge "Fix issue where device does not create any phone accounts."
am: f132c78598 -s ours
am skip reason: change_id Iaef69a5331078a9f848cc00e7e98e46b3a8862a6 with SHA1 da6a28d596 is in history

Change-Id: Idfa5e8da64b1b7d5c27114f4ebc66373c4e278af