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