Merge "Avoid traversal in tunnel mode reporter" into sc-dev am: 6b903996 am: f5a19c6e am: 630c6367

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

Change-Id: Ifcaafa787cfd2adcf21c911151876c980644f777