Merge "Remove obsolete core/res owners" am: c117fd9826 am: 13cf655c86

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

Change-Id: If63322c2cf25bc46265e746d07917d60ea2ec917
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>