Merge "Merge "Fix tethering jarjar rule for LocalLog" into rvc-dev am:...

Merge "Merge "Fix tethering jarjar rule for LocalLog" into rvc-dev am: 6127ca43 am: ac7a897a am: fa99bb4b" into rvc-qpr-dev-plus-aosp am: 3e3d4dc4

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

Change-Id: I4d59d30dd883b57d3be8ee79648549e0bccabc99