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

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



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