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

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

Change-Id: I9ec0afdf758b1775b8a42290c92108deac8dfd6e