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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibe63a175ec753f3e0b63a19b91bacb8901881ea2