Merge "Revert "Updating ownership of color resources"" into main am: ae51c429

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



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