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

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

Change-Id: I7bb53d567d76929c2f9c7da53046455bd3eb265c