Merge "Don't preload into nonexistent zygote" am: c3a27297c4 am: 3aab9125d9

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

Change-Id: Ic85395f2a2930d989bd41fb1ecc1e2c4494e4160
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>