[automerger] Merge "Disable add accounts for user 0." into pi-dev am: 3605cfc03a am: 769aae8240

Change-Id: I1df6c23f6bafb8920847218e284502b38aee02e4