Merge changes If52ece61,Iedf344f6 am: f6131c483b

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

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