Merge "Add to OWNERS" am: 79411dc6b5 am: f4862f433f

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

Change-Id: I1c483b7e0464c05c37a624ae51731629c9336769