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

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

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