Merge "Delete keystore keys from RecoveryService.rebootRecoveryWithCommand()" into 24D1-dev