Merge "Avoid busy empty loop" am: 2724a3642a

Original change: https://android-review.googlesource.com/c/platform/external/perfetto/+/1916402

Change-Id: Ib0037793b7099c0606b82d63589e435d80fcaaab