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

This reverts commit 57e53c3f.

It should now be fixed upstream in the next LTS merge, so the revert is
not needed.

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