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

Change-Id: Iff3fd7b3a4f4a8547162ca451ece863d40728f3c