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: Ie4e38a936928c17759b61a84fc3c4263e2ad232e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>