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

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

Change-Id: I20538f9c3637fe2282b00ce426c14379fb7899ea