[automerger skipped] Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709) am: 270fd81dc3 -s ours

am skip reason: Change-Id I49618a21a384233768992ba2ae9eaea4507122b8 with SHA-1 6aaf2d6d97 is in history

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

Change-Id: Ib7ce9034c1d61216ab1fb4757a7e58d545deb46e