Merge "Updating ownership of color resources" into main am: 318e906e5a

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

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