[automerger skipped] Merge "[MS68.4] Address comments at aosp/1958144" am: 481c0cd100 am: 51b0fdc3b9 am: 56d297ee33 -s ours

am skip reason: Merged-In I2578e13e2844591adac1d1902f2454ec7079ceea with SHA-1 21d9760250 is already in history

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

Change-Id: I30e9930674cec13233131dec0758209949e1a964