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: Iadc04c96b0b2a00ca6e47d704c789b0a719b1a7f