Merge changes from topic "cherrypicker-L63700000954424743:N16900001262878041" into tm-dev am: 4ecf9dc10a

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

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