Merge "Reset stack guard after fork from Zygote" am: d2915246 am: bddca18b am: 38674fa0

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



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