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

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

Change-Id: Ic809e4649e7e89a5c38ea39a788579b015da00d7