Merge "[MS68.4] Address comments at aosp/1958144" am: 481c0cd100 am: 51b0fdc3b9

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

Change-Id: Idfaa8f4deedbcd38597985bbbf28aa3d9d158a3a