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

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

Change-Id: I981e33ff71cc1d746328fd11afe543fcf15fef40