app circle
Merge branch 'staging' of https://github.com/ValidusAOSP/packages_apps_Settings into staging

Conflicts:
	res/values/slim_strings.xml