[automerger skipped] Merge "Revert "Do not propogate test api access flags to Zygote."" am: 6faddabe am: 1856a9ef am: 1c12237e -s ours am: 3c1913b2

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I15c78273ef8e3fa9f5ab15bc2d057e2d395d9a26