Merge changes Ie102f962,Iaaaab5e4 am: 1d696fe787

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

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