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: cf76f870 am: 1062067e

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



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