Merge "Revert "Add OWNERS block to facilitate in migration"" am: 2228195331

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

Change-Id: I96fe4c33a674e6da1634978f44a5ef58b074e82f