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

[automerger skipped] Merge "Migrate import to use proto_logging" am: 3b332ee0 am: dcfd0134 -s ours am: 6b29599d -s ours

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

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

Change-Id: I3f3167e74830cbd496145d030b0280b679c964d5