Merge "Replace private color attribute with corresponding color resource" into...

Merge "Replace private color attribute with corresponding color resource" into sc-dev am: b62e7a14

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

Change-Id: I9292db7bcf575d41b268d29d063e0c69cd7baa2a