[automerger skipped] Skip ab/7061308 in stage. am: b2d124c0c8 -s ours

am skip reason: Change-Id I04ef025ed537623511a3d346d4c59d6efb6bef3f with SHA-1 8e1e05ec1e is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id70404269c79a1c211628e04ed90dad9aeb8676a