Merge changes Ie2ba9805,I8f5b23f9 am: 7acd206160 am: c93bcbbca0 am: b10567f283

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

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