Merge changes I25158126,I99fcf77b am: d9b378eeef

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

Change-Id: I367a2e9c3d5455c12485a1f4a90341a8cdc87b27
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>