[automerger skipped] Merge "Remove SharedLog usage from NetworkStackClient"...

[automerger skipped] Merge "Remove SharedLog usage from NetworkStackClient" am: 8080688f am: 0a13fe3c am: 951d5538 am: ecef7df6 am: ccb27014 -s ours

am skip reason: Merged-In Ia484ee825cd714fd8eb7704ca1d16acfbe2e7331 with SHA-1 3ef75abe is already in history

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



Change-Id: I1ad93fa0ab31aed39c5094447d33631abb48c417
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>