Merge changes If830eb53,If03514f1 am: 83bd5a5927

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

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