Merge "Include OWNERS file that exists" am: 7e20e9f22b am: f61fbc626c

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

Change-Id: I44b48a319c9d0ad5df0c5ff3f4acf225822f95c5