Merge "Handle scudo_ring_buffer_size = 0" am: cad7f577d1 am: ca83d5092b

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2385374

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