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

Change-Id: I5d8ec8998c92bc23d7545706ae13cd6c3e1a5c68