Merge changes Iade99eeb,I3ede46f5 am: 0c0cbd3c04 am: 08f941b8f3

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

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