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

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



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