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

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

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