Merge "Avoid traversal in tunnel mode reporter" into sc-dev am: 6b9039967e

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/14949466

Change-Id: I1f0a6f5a1cc78afffbafaa17a4f222c0849c67ac