Merge "Stage 'android' package in PerformUnifiedRestoreTask"