Merge "Reset stack guard after fork from Zygote" am: ba550748 am: 5d6adc5a...

Merge "Reset stack guard after fork from Zygote" am: ba550748 am: 5d6adc5a am: b4d605f7 am: 1a57f32a am: b80ba7c6

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



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