Merge "Fix testAppZygoteSyscalls for secondary users." am: e6d41d28e3 am: 3ece56c95b am: 11ca1695b8

Original change: https://android-review.googlesource.com/c/platform/cts/+/1621149

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2cbf0eaa03bbe85728484727afb72d2b54ec741e