[automerger skipped] Merge changes from topic "conn_t_move_stageaosp" into stage-aosp-master am: 9b87b6a09c am: a760e8679d -s ours

am skip reason: Merged-In I87843d554d1e726158f8784aa2ec61c92867ad3e with SHA-1 36331e0aa9 is already in history

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

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