Merge "Let seccomp test support multi user scenario" am: 41707fb612
am: f8c11c4c9e

Change-Id: I6e834ef2b102371cd815789bf5ecfe296df954cb