[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 am: 4da6ddc2 -s ours

am skip reason: Merged-In I95009ff67716ba259b5e0a8f61d8908cb1c6da4a with SHA-1 c1e9454a is already in history

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

Change-Id: I3f06e935987bedbba25a2896c9513040aac39277