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 am: eec10eb4

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



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