[automerger skipped] Merge "Allow PO to set network logging delegate" into...

[automerger skipped] Merge "Allow PO to set network logging delegate" into sc-dev am: e5cb0d2d -s ours

am skip reason: Change-Id I95009ff67716ba259b5e0a8f61d8908cb1c6da4a with SHA-1 daac489d is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13582329

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I513d2450eabc2c4b4da61d901744ec8ecd2a3e91