Merge "Fix "NetworkCallback was not registered" crash" into tm-dev am:...

Merge "Fix "NetworkCallback was not registered" crash" into tm-dev am: 92538a9d am: 5e634165 am: 71d6201b am: b20853a7

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



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