[automerger skipped] Skip ab/7061308 in stage. am: 7199576d57 am: 0712a2b3b2 -s ours

am skip reason: Change-Id Iafed54d903e6a4e4409aa43c237821a59ce8d3eb with SHA-1 b08dd1f6d6 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie9f8139cc05f7b458399d6b6acffd79f2745ed0b