Merge "Add resources owners to core/jni and split-select" am: 2991744d47 am: 578171d320

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4c7c306f78522c509709fc532727dbe7e670f365