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

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

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