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

Merge "[automerger skipped] Merge "Fix jarjar rule for LocalLog" into rvc-dev am: 4e34267c -s ours am: 8181671d -s ours am: e41e5eb6 -s ours" into rvc-qpr-dev-plus-aosp am: 8cccc38e -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: I2dbf82af0d986ae35f7782afb239962fd903a861