Merge "Update OWNERS file" am: f3f95f0381 am: 0f69b2eafd

Original change: https://android-review.googlesource.com/c/platform/dalvik/+/1739514

Change-Id: I0f6cf0af86b8ee53fdb49fe615f175a241e7407c