Merge "Drop support for full backup of com.android.providers.settings"