[automerger skipped] Merge "Do not propogate test api access flags to Zygote." am: 39d22680 am: 756d229f am: b371a1c2 -s ours am: 1c5e6d44 -s ours

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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibb34c76ca6d499ebd8a0dcf88910bff247b6c400