[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: 8706d35d -s ours

am skip reason: Merged-In I0bf109fa78212d6d71ba85d25f80e27e8e7cd900 with SHA-1 a27cd305 is already in history

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

Change-Id: Id5be335e4d88059b43383b8a5c0d0fab332c1910