Merge "Merge "Fix tethering jarjar rule for LocalLog" into rvc-dev am: 6127ca43d6 am: 1e6e79a7c3 am: fa99bb4b35" into rvc-qpr-dev-plus-aosp am: 998679cb27

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

Change-Id: I4d59d30dd883b57d3be8ee79648549e0bccabc99
tree: 0c4844e14054066627deee6b6ce45db468ff4833
  1. Tethering/