[automerger skipped] Fixed incorrect unregister from connectivity service am:...

[automerger skipped] Fixed incorrect unregister from connectivity service am: 7ba0f259 am: 2271e9f1 am: 00e20463 am: 1bc07bd9 am: 97182d41 -s ours

am skip reason: Change-Id Idef20e1cd832623f8052e4701621f876b065ef6e with SHA-1 67918ee9 is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/1438134

Change-Id: I93e64aaa0efffd8967040a0a24ca56c4acd10119