Merge "Revert "Reset stack guard after fork from Zygote"" am: 36ea7d5a am: 4f37f950

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



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