Merge changes from topic "cherrypicker-L06100000954878020:N56300001270177780" into tm-dev am: 29bae99600

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

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