[automerger skipped] Merge "Fix tethering jarjar rule for LocalLog" am:...

[automerger skipped] Merge "Fix tethering jarjar rule for LocalLog" am: f64be2d7 am: f089dd73 -s ours

am skip reason: Change-Id I5f070b96f96aaabf7ec8da52a3d3444ed940fb56 with SHA-1 8b8e72a0 is in history

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

Change-Id: I8940d70a097ca954ceec622ba42663a7fbf11c9c