Merge "Add resource owners" am: d25ad6a116

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iccb44fae12908c3539253399e76aa00993f62777