Reapply "ANDROID: Revert "tracing/ring-buffer: Have polling block on watermark""

This reverts commit 541686ad47d2b3eb58a3d809322fe558b3b2c948, which
reapplys the original revert as the original is still causing crashes.

Bug: 263508491
Cc: Lee Jones <joneslee@google.com>
Change-Id: I35cd4d9cef24e64f2dc3afad85d90d588c09e5f0
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>