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

Merge "Avoid traversal in tunnel mode reporter" into sc-dev am: 6b903996 am: 63f4b03e am: 856fc5f9

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

Change-Id: Iead36b60e8d5a9514b5d89db03d8568030668986