Merge changes from topic "presubmit-am-25573e946ece4fa1804202119abb6474-sc-dev" into sc-qpr1-dev am: d0bb953892

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

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