[NS04.7] Reinstate a necessary change am: dd35f2dab0

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

Change-Id: Ia047b5757328329ceb602ce5dda7ea21e67e9255