Merge "Decrease the app zygote preload timeout." into main am: e2360277f4

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

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