Merge changes Ie2ba9805,I8f5b23f9 am: 7acd206160

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

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