Merge "Add OWNERS block for code move" am: 9860ef9b01 am: 8014f95d96

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

Change-Id: I666226411621abb82d6a1f5a0b2796063971992e