Merge changes from topic "conn_t_move_stageaosp" into stage-aosp-master am: 9b87b6a09c

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

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