Merge "Update the resources owners" into main am: 20da2afe am: 21552d0a...

Merge "Update the resources owners" into main am: 20da2afe am: 21552d0a am: 3ebe5ec6 am: 2da74c0c am: 52be7930

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



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