Revert "Revert "Revert "ChaosLab: Add annotation to be used when adding new features to the lab."""

This reverts commit 9e4bc0f8bbeaef10306847ce8c27281c14f5d75c.
Revert "Identicons: Add identicons to ChaOS Lab [1/3]"

This reverts commit 0650085eaaebf96b9b1996dd6fe47dce6eee3adb.

Conflicts:
	core/java/android/provider/Settings.java