[automerger skipped] Merge "Remove simColors from public.xml and rename" am:...
[automerger skipped] Merge "Remove simColors from public.xml and rename" am: 3ccf865e am: 6cbcc78f -s ours
am skip reason: Change-Id I263869221fff9af500adae012e8af9c1545f51f1 with SHA-1 b153d59e is in history
Change-Id: Ie1102ef6a715f8bf688cc47fa0240995b577cdf3