[2/2] Settings: OmniBackup

OmniGears: https://gerrit.omnirom.org/#/c/6330/

Change-Id: If1b3c9466d43b402150efd948e51388deb130c5c

Conflicts:

	AndroidManifest.xml
	src/com/android/settings/PrivacySettings.java