[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 am: 43c54b19 am: 3df5e7a7 -s ours am: e4085fa6 -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: I7113e12c8c3c7d91bb9ea26dbb96fcc5f8c3d548