Merge remote-tracking branch 'PA/kitkat' into remix-staging

Conflicts:
	proguard.flags
Remove LockClock settings
Fix two errors
Revert "Create Omni audio theme's SoundPacks folder if necessary"

This reverts commit 067d573cca8b49aa1363a85276166216332bddbf.
Revert "[3/3] Settings: Audio Themes Settings"

This reverts commit 2c9de17d35f1f68373494dc722033078ddb89d9a.

Conflicts:
	res/values/pa_strings.xml
Merge remote-tracking branch 'settings/remix-staging' into legacy-staging

Conflicts:
	AndroidManifest.xml
	proguard.flags
	res/values/psd_strings.xml