[automerger skipped] Merge "Revert "Do not propogate test api access flags to...

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

am skip reason: skipped by user pgrafov

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia8443dfd924d33552e500847bcb7e4695b579169