[automerger skipped] Skip ab/6749736 in stage. am: 2b01ca0366 -s ours am: 7fb1c72b8c -s ours

am skip reason: Change-Id I0700896f4d8cc1543fc00bb8c7db4772acff16aa with SHA-1 cb697871c7 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/external/openssh/+/12797071

Change-Id: I520e1351d9c3840c31426f2863ffb8a7ed580bc1