Merge "Fix some resources OWNERS files" am: 9a90f629aa am: df67697c7e

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

Change-Id: I5d457349ec165a76fe8653c0e356c23ecc2ec401