Merge changes Id533cdb4,I6a9ce3d6,I345bf073 into sc-mainline-prod am: c3315f2560

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

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