Merge "Fixup AppSecurityHostTests to run on secondary users."