Merge "Disable add accounts for user 0." into pi-dev
am: 3605cfc03a

Change-Id: If9eed61478cc90db9201168c10df566b16fd0bb8