Merge "Update the resources owners" into main am: 20da2afe2e am: 21552d0af9 am: 3ebe5ec63a am: 2da74c0cb6

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

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