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

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

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