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

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



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