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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8ac2127766ab9f24ab3110c08a94ebba25b4d00f