[automerger skipped] Merge "Migrate import to use proto_logging" into...

[automerger skipped] Merge "Migrate import to use proto_logging" into mainline-prod am: ac9ff375 -s ours

am skip reason: Change-Id I73da562b494a2f086702cd5b73894d808257bbe8 with SHA-1 54525e86 is in history

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

Change-Id: I9616865bd856ab57434d9b26cf06c83b0c2f576b