Merge "Fix CTS fail to register network callback since lack of permission" am: f7d188c8c9

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

Change-Id: I0e849ab438734eae7e0577a463459405062d8124