Merge changes I1b2e50f1,I78926bf7 am: e491095525

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

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