Merge RQ1A.210105.003 to aosp-master - DO NOT MERGE am: da4b51ba32
Original change: https://android-review.googlesource.com/c/platform/external/gptfdisk/+/1541047 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I2d32d2d7bf5e2916ce205021b4ea07948bb6e110
This commit is contained in: