Android 11.0.0 Release 40 (RQ3A.210805.001.A1)
[automerger skipped] RESTRICT AUTOMERGE am: e384a934c4 am: 8e47293ec8 am: 0c7742cfa9 -s ours am: 18b974f125 -s ours am: 918b997bb8 am: f403760140 -s ours am: 6bb2d4e3a4 am: 8552eb33aa

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

Change-Id: Ic668e31fad1d67758d52e51e11e07649804c8494