Merge "Fix tethering jarjar rule for LocalLog" into rvc-dev am: 6127ca43d6 am: c1017f07e9

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

Change-Id: I0a6c2b29c04aa8105c8d1cf9075491d950912d29