[automerger skipped] Merge "Remove simColors from public.xml and rename" am: 30970c1745 am: 96a4994f6b -s ours am: 4d04d4e312 -s ours am: f811760ca6 -s ours
am skip reason: Change-Id Ida5aafb2db2b47ac5fb0ac098927c0801a717d9b with SHA-1 6132a6d0db is in history
Change-Id: I40a1b3a511861d63c63d8abd1c56f1dfef072c34
This commit is contained in: