[automerger skipped] Merge "Allow app zygote preload to retain files across...

[automerger skipped] Merge "Allow app zygote preload to retain files across fork" into sc-dev am: 2eca0791 -s ours am: 8cc5171e -s ours am: f0578e1f -s ours

am skip reason: Merged-In Ie302eabca83a0e4f409cb131e4308b73e5f6a580 with SHA-1 ed10978d is already in history

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

Change-Id: I228c760bc93de483e2edeb0b3eaa2795f09d0c7c