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

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

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