Merge "[vndk] Cleanup OWNERS files" am: e5518609e1 am: 035fe0ec30

Original change: https://android-review.googlesource.com/c/platform/development/+/1826269

Change-Id: I323513b3cdfb443196da9f74d187ccb0ef4bbb30