[automerger skipped] [NS04.7] Reinstate a necessary change am: dd35f2dab0 am: f2515d397c -s ours am: f11a106896 -s ours
am skip reason: Merged-In I3c2563d4ae4e3715d0c6270344ba8f7ef067872f with SHA-1 2afd0986d3 is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1722737
Change-Id: I0a2f1de2d2a1297491701c6c4498566fc2fba191
This commit is contained in: