Merge "Revert "Updating ownership of color resources"" into main am: ae51c4299f am: 089b0cf033

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

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