Merge "Revert "Add BackupEncryption apk as requirement for services""