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

Change-Id: Icdcf895e5512304ce527d626ddb66c92c275154c