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

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



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