[automerger skipped] Merge Android R am: d0c42f389a -s ours

am skip reason: Change-Id I54d04ed92be7cdaa42c5be776f666d772e1a5214 with SHA-1 270fd81dc3 is in history

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

Change-Id: I1d6a1a452e8c8e8536d995b20b1193e0106190fb