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

[automerger skipped] Merge "Migrate import to use proto_logging" into rvc-qpr-dev-plus-aosp am: 034aa9b6 -s ours

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

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

Change-Id: I236bb0ed12bae1671ae17de5f8a2b3f3ee6bff6d