Merge "Handle empty <cloud-backup> section in android:dataExtractionRules" into sc-dev