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

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

Change-Id: Ie42e4eeca56b5d4c1b1d087343ab5cadbd8130e4