Merge "Fixup AppSecurityHostTests to run on secondary users."
am: 72edfecc4b

Change-Id: I3a64baf5c9bbb98525d3c15cad1b8bf31ec4e7e6