Merge "Add resource owners" am: d25ad6a116 am: 80382deadc

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1d3562d61b9a663a5911df18230867652d56ce51