Fix derp in identicons + gesture

Signed-off-by: Arnav Gosain <nolinuxnoparty@gmail.com>

Conflicts:

	res/values/cr_attrs.xml

Conflicts:
	res/xml/gesture_anywhere.xml
	src/com/android/settings/chameleonos/labs/gestureanywhere/GestureAnywhereSettings.java
Merge github.com:Pixel2K14/packages_apps_Settings into HEAD