[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: 010a53c4 -s ours am: c20caa57 -s ours am: de6ef238 -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: I3a0afe948361ac81206310a1e29832fc6cbf28b6