[automerger skipped] Merge "Do not propogate test api access flags to Zygote." am: 39d22680c9 am: 756d229f09 am: b371a1c255 -s ours

am skip reason: Change-Id I0e58b6924744590afaadec6a6230aa9d552b2f6f with SHA-1 eb05e6c8fa is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1558556

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0ede05eea2a25b326bc30fac38d9c5d0771ea0a4