Merge changes Ie2ba9805,I8f5b23f9 am: 7acd206160 am: f92516d058

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

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