[automerger skipped] Merge RQ1A.210105.003 to aosp-master - DO NOT MERGE am: da4b51ba32 am: 9da9d5df0a -s ours am: 017f45f40d -s ours

am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib5d18bedad0b892d2f05eb19912a8d6ea15b6b67