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

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

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