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

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

Change-Id: Id6669017476e85eaf80d9a3ad19bf12b615bfdc4