Merge changes from topic "cherrypicker-L48400000954920366:N08700001270826034" into tm-dev am: d67018db2d

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

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