Merge changes Iade99eeb,I3ede46f5 am: 0c0cbd3c04

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

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