Merge "[Bugfix] Add reading timeout when waiting for the reply of an application zygote." am: 5a3d902415 am: 4c0abd3227

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

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