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

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

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



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