Merge "Fix OWNERS." am: 801b546a56 am: 8780d07b94

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

Change-Id: Ib3d5ffa8703f05a9fb42955c322a50ac1593edd4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>