Merge "Update OWNERS file" am: d6c3dfb3ff am: 4f5e3b92f7 am: f1eb6c7bf4

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1640627

Change-Id: I011e62c84151f46fbf4223cd52d11f2edb3d6c30