Merge "Clear calling uid in isAppEligibleForBackup() and variant"