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

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

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