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

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

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



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