Merge "NullPointerException due to command:adb shell service call connectivity 79 -> void unofferNetwork(in INetworkOfferCallback callback)" am: b091693d36 am: fb4bd3f98a

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2171110

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