Merge "Revert "Grant FLAG_PRIMARY to the first human user in headless system user mode.""