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

Change-Id: Idaacaf13c9b8017f50a0cc68dfa2d57b7cd2f5a1