[automerger skipped] DO NOT MERGE - Merge ab/7272582 am: 12e8feff97 am: 3c564e730e am: 35b34ae239 -s ours am: 25b788036d -s ours

am skip reason: subject contains skip directive

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

Change-Id: I594c9b51aa48a232ef0f70176e3409b0852d1b4c