Merge "Updating ownership of color resources" into main am: 0272670024 am: 356e835b21

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

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