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

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

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