Merge "stack_protector_DeathTest#modify_stack_protector: avoid flake." into android12-tests-dev am: 793d1fb5ab

Original change: https://android-review.googlesource.com/c/platform/bionic/+/2240186

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