Merge "Fix tethering jarjar rule for LocalLog" into rvc-dev am: 6127ca43d6 am: ac7a897a82 am: 18391c5eed am: 3a2c00547b

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

Change-Id: I3ad2bf851e26243e29d5fd60ef47e2c1f5afa245