[automerger skipped] Merge "Fix jarjar rule for LocalLog" into rvc-dev am:...

[automerger skipped] Merge "Fix jarjar rule for LocalLog" into rvc-dev am: 4e34267c -s ours am: 8181671d -s ours am: e41e5eb6 -s ours

am skip reason: Change-Id I3864ce089c02d53dfc6d0f9c58ac4a84daaaf787 with SHA-1 20341352 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/NetworkStack/+/12018738

Change-Id: Idca0665c743a636aa24b215cc69230a53d4cc1e5