Merge changes If52ece61,Iedf344f6 am: f6131c483b am: 9d6decd77f

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

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